diff --git a/test/boxmodels/1p/test_1p.input b/test/boxmodels/1p/test_1p.input
index 2a1984fbe858146998e82af264001bc2af6a118a..beed7f7c1f069d293b2219e3b1941fcd9e6492bf 100644
--- a/test/boxmodels/1p/test_1p.input
+++ b/test/boxmodels/1p/test_1p.input
@@ -1,38 +1,38 @@
 #############################################################
-# Parameter file for test_1p							    #
-# Everything behind a '#' is a comment						#
-# Groups can be ordered e.g. : [BoundaryConditions], 	    #
-# see ../2p2c/ for a more detailed example				    #
+# Parameter file for test_1p                                #
+# Everything behind a '#' is a comment                        #
+# Groups can be ordered e.g. : [BoundaryConditions],         #
+# see ../2p2c/ for a more detailed example                    #
 #############################################################
 
 #############################################################
-# Mandatory arguments										#
+# Mandatory arguments                                        #
 #############################################################
-dtInitial	=1	 	# seconds
-tEnd		=1	 	# seconds
-gridFile	=./grids/test_1p_2d.dgf
+dtInitial = 1 # seconds
+tEnd = 1 # seconds
+gridFile = ./grids/test_1p_2d.dgf
 
 ##########################################################################
-# Simulation restart												     #
-#																	     #
-# DuMux simulations can be restarted from *.drs files				     #
+# Simulation restart                                                     #
+#                                                                         #
+# DuMux simulations can be restarted from *.drs files                     #
 # Set restart to the value of a specific file, e.g.:  'restart = 27184.1'#
-# for the restart file												     #
-# name_time=27184.1_rank=0.drs										     #
-# Please comment in the below value, if restart is desired. 		     #
+# for the restart file                                                     #
+# name_time = 27184.1_rank = 0.drs                                             #
+# Please comment in the below value, if restart is desired.              #
 ##########################################################################
-# restart= ... 
+# restart = ... 
 
 #####################################################################
 # SpatialParameters                                                 #
 #####################################################################
 [SpatialParameters]
 #lens from (0.25|0.25) to (0.75|0.75) box-wise definition of permability
-lensLowerLeftX  = 0.25  
-lensLowerLeftY  = 0.25
+lensLowerLeftX = 0.25  
+lensLowerLeftY = 0.25
 lensUpperRightX = 0.75
 lensUpperRightY = 0.75
 
 #permeabilities
-permeability    = 1e-10
-permeabilityLens= 1e-12
\ No newline at end of file
+permeability = 1e-10
+permeabilityLens = 1e-12
\ No newline at end of file
diff --git a/test/boxmodels/1p2c/test_1p2c.input b/test/boxmodels/1p2c/test_1p2c.input
index 98b7b3305cdd952f0264687efdcd7bd249d45096..ebbdd2b838cde865443a595006e7073619842253 100644
--- a/test/boxmodels/1p2c/test_1p2c.input
+++ b/test/boxmodels/1p2c/test_1p2c.input
@@ -1,24 +1,24 @@
 #############################################################
-# Parameter file for test_1p2c								#
-# Everything behind a '#' is a comment						#
-# Groups can be ordered e.g. : [BoundaryConditions], 		#
-# see ../2p2c/ for a more detailed example					#
+# Parameter file for test_1p2c                                #
+# Everything behind a '#' is a comment                        #
+# Groups can be ordered e.g. : [BoundaryConditions],         #
+# see ../2p2c/ for a more detailed example                    #
 #############################################################
 
 #############################################################
-# Mandatory arguments										#
+# Mandatory arguments                                        #
 #############################################################
-dtInitial	=1 	# seconds
-tEnd		=100 	# seconds
-gridFile	=./grids/test_1p2c.dgf
+dtInitial = 1 # seconds
+tEnd = 100 # seconds
+gridFile = ./grids/test_1p2c.dgf
 
 ##########################################################################
-# Simulation restart											         #
-#																	     #
-# DuMux simulations can be restarted from *.drs files				     #
+# Simulation restart                                                     #
+#                                                                         #
+# DuMux simulations can be restarted from *.drs files                     #
 # Set restart to the value of a specific file, e.g.:  'restart = 27184.1'#
-# for the restart file													 #
-# name_time=27184.1_rank=0.drs										     #
-# Please comment in the below value, if restart is desired. 			 #
+# for the restart file                                                     #
+# name_time = 27184.1_rank = 0.drs                                             #
+# Please comment in the below value, if restart is desired.              #
 ##########################################################################
-# restart= ... 
\ No newline at end of file
+# restart = ... 
\ No newline at end of file
diff --git a/test/boxmodels/2p/test_2p.input b/test/boxmodels/2p/test_2p.input
index e8d050b5a6c60a45cc54c911afc3d4d1ff622b1c..e1fc87555eaf45356ead828cb42fae9a4beb8133 100644
--- a/test/boxmodels/2p/test_2p.input
+++ b/test/boxmodels/2p/test_2p.input
@@ -1,30 +1,30 @@
 #############################################################
-# Parameter file for test_2p										#
-# Everything behind a '#' is a comment								#
-# Groups can be ordered e.g. : [BoundaryConditions], 					#
-# see ../2p2c/ for a more detailed example							#
+# Parameter file for test_2p                                        #
+# Everything behind a '#' is a comment                                #
+# Groups can be ordered e.g. : [BoundaryConditions],                     #
+# see ../2p2c/ for a more detailed example                            #
 #############################################################
 
 #############################################################
-# Mandatory arguments											#
+# Mandatory arguments                                            #
 #############################################################
-dtInitial	=250 	# [s]
-tEnd		=1000 	# [s]
-gridFile 	= ./grids/test_2p.dgf 
+dtInitial = 250# [s]
+tEnd = 1000# [s]
+gridFile = ./grids/test_2p.dgf 
 
 [SpatialParameters]
-lensLowerLeftX	= 1.0 # [m] dimension of the lens (different properties therin) 
-lensLowerLeftY	= 2.0 # [m] dimension of the lens (different properties therin)
-lensUpperRightX	= 4.0 # [m] dimension of the lens (different properties therin)
-lensUpperRightY	= 3.0 # [m] dimension of the lens (different properties therin)
+lensLowerLeftX = 1.0 # [m] dimension of the lens (different properties therin) 
+lensLowerLeftY = 2.0 # [m] dimension of the lens (different properties therin)
+lensUpperRightX = 4.0 # [m] dimension of the lens (different properties therin)
+lensUpperRightY = 3.0 # [m] dimension of the lens (different properties therin)
 
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
\ No newline at end of file
+# restart = ... 
\ No newline at end of file
diff --git a/test/boxmodels/2p2c/test_2p2c.input b/test/boxmodels/2p2c/test_2p2c.input
index 6aebc0f1ca78888bc5fbe6be1334c32f3f378df2..a24fdeb34c01c5017378cb3c3b327acc5ba4b97c 100644
--- a/test/boxmodels/2p2c/test_2p2c.input
+++ b/test/boxmodels/2p2c/test_2p2c.input
@@ -1,39 +1,39 @@
 ###########################################################################
-# Parameter file for test_2p2c												    # 
-# Everything behind a '#' is a comment											    #
-# Groups can be ordered e.g. : [BoundaryConditions]								    #
+# Parameter file for test_2p2c                                                    # 
+# Everything behind a '#' is a comment                                                #
+# Groups can be ordered e.g. : [BoundaryConditions]                                    #
 # Parameters in groups have to be accessed hierarchically e.g.: FluidSystem.pressureLow #
 ###########################################################################
 
 #####################################################################
-# Mandatory arguments												        #
+# Mandatory arguments                                                        #
 #####################################################################
-dtInitial=250 	# [s]
-tEnd=1e4 	# [s]
-gridFile=./grids/test_2p2c.dgf # relative path to the grid file
+dtInitial = 250# [s]
+tEnd = 1e4# [s]
+gridFile = ./grids/test_2p2c.dgf # relative path to the grid file
 
 [FluidSystem]
-nTemperature		= 3 # [-]			number of tabularization entries
-nPressure 		= 200 # [-]		number of tabularization entries
-pressureLow 		= 1e5 # [Pa] 		low end for tabularization of fluid properties
-pressureHigh 		= 3e7 # [Pa] 		high end for tabularization of fluid properties
-temperatureLow 	= 312.15 # [Pa] 	low end for tabularization of fluid properties
-temperatureHigh	= 314.15 # [Pa] 	high end for tabularization of fluid properties
+nTemperature = 3# [-]            number of tabularization entries
+nPressure = 200# [-]        number of tabularization entries
+pressureLow = 1e5# [Pa]         low end for tabularization of fluid properties
+pressureHigh = 3e7# [Pa]         high end for tabularization of fluid properties
+temperatureLow = 312.15 # [Pa]     low end for tabularization of fluid properties
+temperatureHigh = 314.15 # [Pa]     high end for tabularization of fluid properties
 
 [SimulationControl]
-name		= injection # [-]			the name of the output files
+name = injection# [-]            the name of the output files
 
 [InitialConditions]
-temperature	= 313.15 # [K] 			initial temperature in the reservoir 273.15 + 40
-depthBOR	= 2700 # [m] 			depth below ground surface 
+temperature = 313.15 # [K]             initial temperature in the reservoir 273.15 + 40
+depthBOR = 2700# [m]             depth below ground surface 
 
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
\ No newline at end of file
+# restart = ... 
\ No newline at end of file
diff --git a/test/boxmodels/2p2cni/test_2p2cni.input b/test/boxmodels/2p2cni/test_2p2cni.input
index 92827e1eabb06d8934ee3ac9a15cafc048d57c9d..1ad33caa8d3fbcb73c6e9c1a72e031b861d46beb 100644
--- a/test/boxmodels/2p2cni/test_2p2cni.input
+++ b/test/boxmodels/2p2cni/test_2p2cni.input
@@ -1,24 +1,24 @@
 #############################################################
-# Parameter file for test_2p2cni									#
-# Everything behind a '#' is a comment								#
-# Groups can be ordered e.g. : [BoundaryConditions], 					#
-# see ../2p2c/ for a more detailed example							#
+# Parameter file for test_2p2cni                                    #
+# Everything behind a '#' is a comment                                #
+# Groups can be ordered e.g. : [BoundaryConditions],                     #
+# see ../2p2c/ for a more detailed example                            #
 #############################################################
 
 #############################################################
-# Mandatory arguments											#
+# Mandatory arguments                                            #
 #############################################################
-dtInitial	=250 	# seconds
-tEnd		=1e4 	# seconds
-gridFile	=./grids/test_2p2cni.dgf
+dtInitial = 250 # seconds
+tEnd = 1e4 # seconds
+gridFile = ./grids/test_2p2cni.dgf
  
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
\ No newline at end of file
+# restart = ... 
\ No newline at end of file
diff --git a/test/boxmodels/2pni/test_2pni.input b/test/boxmodels/2pni/test_2pni.input
index 599c9c9a4a7dcf11f912439d87fd55ae4dd7dfd4..8c9b36cc56f6b7af1fc3fcb7d4a286ea8a062881 100644
--- a/test/boxmodels/2pni/test_2pni.input
+++ b/test/boxmodels/2pni/test_2pni.input
@@ -1,29 +1,29 @@
 #############################################################
-# Parameter file for test_2pni										#
-# Everything behind a '#' is a comment								#
-# Groups can be ordered e.g. : [BoundaryConditions], 					#
-# see ../2p2c/ for a more detailed example							#
+# Parameter file for test_2pni                                        #
+# Everything behind a '#' is a comment                                #
+# Groups can be ordered e.g. : [BoundaryConditions],                     #
+# see ../2p2c/ for a more detailed example                            #
 #############################################################
 
 #############################################################
-# Mandatory arguments											#
+# Mandatory arguments                                            #
 #############################################################
-dtInitial	= 250 	# [s]
-tEnd		= 1e4 	# [s]
+dtInitial = 250# [s]
+tEnd = 1e4# [s]
 
 [Grid]
-numberOfCellsX 		= 24 # [-] resolution in x-direction
-numberOfCellsY 		= 16 # [-] resolution in y-direction
+numberOfCellsX = 24# [-] resolution in x-direction
+numberOfCellsY = 16# [-] resolution in y-direction
 
-upperRightX 		= 60 # [m] dimension of the grid
-upperRightY 		= 40 # [m] dimension of the grid
+upperRightX = 60# [m] dimension of the grid
+upperRightY = 40# [m] dimension of the grid
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
+# restart = ... 
diff --git a/test/boxmodels/3p3c/test_3p3c.input b/test/boxmodels/3p3c/test_3p3c.input
index 17c138a38a6d881c557b4c467ed71836cd9a193c..773aba14b58c8a83f69fed1e034da4ca90a70727 100644
--- a/test/boxmodels/3p3c/test_3p3c.input
+++ b/test/boxmodels/3p3c/test_3p3c.input
@@ -1,24 +1,24 @@
 #############################################################
-# Parameter file for test_3p3c									#
-# Everything behind a '#' is a comment								#
-# Groups can be ordered e.g. : [BoundaryConditions], 					#
-# see ../2p2c/ for a more detailed example							#
+# Parameter file for test_3p3c                                    #
+# Everything behind a '#' is a comment                                #
+# Groups can be ordered e.g. : [BoundaryConditions],                     #
+# see ../2p2c/ for a more detailed example                            #
 #############################################################
 
 #############################################################
-# Mandatory arguments											#
+# Mandatory arguments                                            #
 #############################################################
-dtInitial	=60 		# [s]
-tEnd		=864000 	# [s]
-gridFile	=./grids/test_3p3c.dgf
+dtInitial = 60# [s]
+tEnd = 864000# [s]
+gridFile = ./grids/test_3p3c.dgf
 
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
\ No newline at end of file
+# restart = ... 
\ No newline at end of file
diff --git a/test/boxmodels/3p3cni/test_3p3cni.input b/test/boxmodels/3p3cni/test_3p3cni.input
index 19f66c5b375f1c8f755d7dd239f36b9bf74c9d06..5a1d4ed2ab07adf8d27dae7b7607e8bbb4dfdbb9 100644
--- a/test/boxmodels/3p3cni/test_3p3cni.input
+++ b/test/boxmodels/3p3cni/test_3p3cni.input
@@ -1,24 +1,24 @@
 #############################################################
-# Parameter file for test_3p2cni									#
-# Everything behind a '#' is a comment								#
-# Groups can be ordered e.g. : [BoundaryConditions], 					#
-# see ../2p2c/ for a more detailed example							#
+# Parameter file for test_3p2cni                                    #
+# Everything behind a '#' is a comment                                #
+# Groups can be ordered e.g. : [BoundaryConditions],                     #
+# see ../2p2c/ for a more detailed example                            #
 #############################################################
 
 #############################################################
-# Mandatory arguments											#
+# Mandatory arguments                                            #
 #############################################################
-dtInitial	=1 		# [s]
-tEnd		=1800 	# [s]
-gridFile	=./grids/kuev_2p2cni.dgf
+dtInitial = 1# [s]
+tEnd = 1800# [s]
+gridFile = ./grids/kuev_2p2cni.dgf
 
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
\ No newline at end of file
+# restart = ... 
\ No newline at end of file
diff --git a/test/boxmodels/mpnc/test_mpnc.input b/test/boxmodels/mpnc/test_mpnc.input
index 011fbebf110f813a82b0fcab02892358b6591c5e..414aa892a5dfb7594ff2c06cb01f7f7c7bbb203b 100644
--- a/test/boxmodels/mpnc/test_mpnc.input
+++ b/test/boxmodels/mpnc/test_mpnc.input
@@ -1,24 +1,24 @@
 #############################################################
-# Parameter file for test_MpNc									#
-# Everything behind a '#' is a comment								#
-# Groups can be ordered e.g. : [BoundaryConditions], 					#
-# see ../2p2c/ for a more detailed example							#
+# Parameter file for test_MpNc                                    #
+# Everything behind a '#' is a comment                                #
+# Groups can be ordered e.g. : [BoundaryConditions],                     #
+# see ../2p2c/ for a more detailed example                            #
 #############################################################
 
 #############################################################
-# Mandatory arguments											#
+# Mandatory arguments                                            #
 #############################################################
-dtInitial	=250 	# seconds
-tEnd		=1e4 	# seconds
-gridFile	=./grids/obstacle_24x16.dgf 
+dtInitial = 250 # seconds
+tEnd = 1e4 # seconds
+gridFile = ./grids/obstacle_24x16.dgf 
 
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
\ No newline at end of file
+# restart = ... 
\ No newline at end of file
diff --git a/test/boxmodels/richards/test_richards.input b/test/boxmodels/richards/test_richards.input
index 956b34cade585618a869f67984b9e41c11be619f..c7298649554950cde96ef233907680880fdf78c8 100644
--- a/test/boxmodels/richards/test_richards.input
+++ b/test/boxmodels/richards/test_richards.input
@@ -1,24 +1,24 @@
 #############################################################
-# Parameter file for test_richards									#
-# Everything behind a '#' is a comment								#
-# Groups can be ordered e.g. : [BoundaryConditions], 					#
-# see ../2p2c/ for a more detailed example							#
+# Parameter file for test_richards                                    #
+# Everything behind a '#' is a comment                                #
+# Groups can be ordered e.g. : [BoundaryConditions],                     #
+# see ../2p2c/ for a more detailed example                            #
 #############################################################
 
 #############################################################
-# Mandatory arguments											#
+# Mandatory arguments                                            #
 #############################################################
-dtInitial	=100 	# seconds
-tEnd		=3000 	# seconds
-gridFile	=./grids/richardslens-24x16.dgf
+dtInitial = 100 # seconds
+tEnd = 3000 # seconds
+gridFile = ./grids/richardslens-24x16.dgf
 
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
\ No newline at end of file
+# restart = ... 
\ No newline at end of file
diff --git a/test/decoupled/1p/test_1p.input b/test/decoupled/1p/test_1p.input
index 12518633d9db15738eff6819dfeb62d5a8cbfaae..95ea22e9214dc48964023ca862f1b2a3ec97d705 100644
--- a/test/decoupled/1p/test_1p.input
+++ b/test/decoupled/1p/test_1p.input
@@ -1,33 +1,33 @@
 #############################################################
-# Parameter file for test_1p										#
-# Everything behind a '#' is a comment								#
-# Groups can be ordered e.g. : [BoundaryConditions], 					#
-# see ../2p2c/ for a more detailed example							#
+# Parameter file for test_1p                                        #
+# Everything behind a '#' is a comment                                #
+# Groups can be ordered e.g. : [BoundaryConditions],                     #
+# see ../2p2c/ for a more detailed example                            #
 #############################################################
 
 #############################################################
-# Mandatory arguments											#
+# Mandatory arguments                                            #
 #############################################################
-numRefine 	=3	 	# refinement level of the created grid
-dtInitial		=0 		# [s]
-tEnd			=0 		# [s]
+numRefine = 3 # refinement level of the created grid
+dtInitial = 0# [s]
+tEnd = 0# [s]
 
-# delta 		= 1e-6	# [-] if this is commented in, it is used
+# delta = 1e-6    # [-] if this is commented in, it is used
 
 [Grid]
-numberOfCellsX 		= 1 # [-] resolution in x-direction
-numberOfCellsY 		= 1 # [-] resolution in y-direction
+numberOfCellsX = 1# [-] resolution in x-direction
+numberOfCellsY = 1# [-] resolution in y-direction
 
-upperRightX 		= 1 # [m] dimension of the grid
-upperRightY 		= 1 # [m] dimension of the grid
+upperRightX = 1# [m] dimension of the grid
+upperRightY = 1# [m] dimension of the grid
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
+# restart = ... 
 
diff --git a/test/decoupled/2p/test_impes.input b/test/decoupled/2p/test_impes.input
index 16d8291a892782f9e6dd3905842bdcf0872a9565..caf7065008b4b2d0bc898b6171483f0e0d456fef 100644
--- a/test/decoupled/2p/test_impes.input
+++ b/test/decoupled/2p/test_impes.input
@@ -1,30 +1,30 @@
 #############################################################
-# Parameter file for test_impes									#
-# Everything behind a '#' is a comment								#
-# Groups can be ordered e.g. : [BoundaryConditions], 					#
-# see ../boxmodels/2p2c/ for a more detailed example					#
+# Parameter file for test_impes                                    #
+# Everything behind a '#' is a comment                                #
+# Groups can be ordered e.g. : [BoundaryConditions],                     #
+# see ../boxmodels/2p2c/ for a more detailed example                    #
 #############################################################
 
 #############################################################
-# Mandatory arguments											#
+# Mandatory arguments                                            #
 #############################################################
-tEnd			= 1e7	# [s]
-dtInitial		= 0 		#[s]
+tEnd = 1e7# [s]
+dtInitial = 0#[s]
 
 [Grid]
-numberOfCellsX 		= 30 # [-] resolution in x-direction
-numberOfCellsY 		= 6 # [-] resolution in y-direction
+numberOfCellsX = 30# [-] resolution in x-direction
+numberOfCellsY = 6# [-] resolution in y-direction
 
-upperRightX 		= 300 # [m] dimension of the grid
-upperRightY 		= 60 # [m] dimension of the grid
+upperRightX = 300# [m] dimension of the grid
+upperRightY = 60# [m] dimension of the grid
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
+# restart = ... 
 
diff --git a/test/decoupled/2p/test_transport.input b/test/decoupled/2p/test_transport.input
index c38544bff79f6c4679d68f82da1095bd84b64e80..b2d6f077be911db2f88a018f8d3c0899243b1237 100644
--- a/test/decoupled/2p/test_transport.input
+++ b/test/decoupled/2p/test_transport.input
@@ -1,25 +1,25 @@
 #############################################################
-# Parameter file for test_transport									#
-# Everything behind a '#' is a comment								#
-# Groups can be ordered e.g. : [BoundaryConditions], 					#
-# see ../boxmodels/2p2c/ for a more detailed example					#
+# Parameter file for test_transport                                    #
+# Everything behind a '#' is a comment                                #
+# Groups can be ordered e.g. : [BoundaryConditions],                     #
+# see ../boxmodels/2p2c/ for a more detailed example                    #
 #############################################################
 
 #############################################################
-# Mandatory arguments											#
+# Mandatory arguments                                            #
 #############################################################
-tEnd			= 1e4	# [s]
-dtInitial		= 0	# [s]
-gridFile 	= ./grids/test_transport.dgf
+tEnd = 1e4# [s]
+dtInitial = 0# [s]
+gridFile = ./grids/test_transport.dgf
 
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
+# restart = ... 
 
diff --git a/test/decoupled/2p2c/test_dec2p2c.input b/test/decoupled/2p2c/test_dec2p2c.input
index 13411b74d4e50fc80fc96dc7d72bb075a9c1cbfa..950c15a422d2316414f4866d2b14437a51323fee 100644
--- a/test/decoupled/2p2c/test_dec2p2c.input
+++ b/test/decoupled/2p2c/test_dec2p2c.input
@@ -1,32 +1,32 @@
 #############################################################
-# Parameter file for test_dec2p2c									#
-# Everything behind a '#' is a comment								#
-# Groups can be ordered e.g. : [BoundaryConditions], 					#
-# see ../boxmodels/2p2c/ for a more detailed example					#
+# Parameter file for test_dec2p2c                                    #
+# Everything behind a '#' is a comment                                #
+# Groups can be ordered e.g. : [BoundaryConditions],                     #
+# see ../boxmodels/2p2c/ for a more detailed example                    #
 #############################################################
 
 #############################################################
-# Mandatory arguments											#
+# Mandatory arguments                                            #
 #############################################################
-tEnd			= 3e3	# [s]
-dtInitial		= 200 		#[s]
+tEnd = 3e3# [s]
+dtInitial = 200#[s]
 
 [Grid]
-numberOfCellsX 		= 10 # [-] resolution in x-direction
-numberOfCellsY 		= 10 # [-] resolution in y-direction
-numberOfCellsZ 		= 10 # [-] resolution in y-direction
+numberOfCellsX = 10# [-] resolution in x-direction
+numberOfCellsY = 10# [-] resolution in y-direction
+numberOfCellsZ = 10# [-] resolution in y-direction
 
-upperRightX 		= 10 # [m] dimension of the grid
-upperRightY 		= 10 # [m] dimension of the grid
-upperRightZ 		= 10 # [m] dimension of the grid
+upperRightX = 10# [m] dimension of the grid
+upperRightY = 10# [m] dimension of the grid
+upperRightZ = 10# [m] dimension of the grid
 #####################################################################
-# Simulation restart													        #
-#																	#
-# DuMux simulations can be restarted from *.drs files							#
-# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'				#
-# for the restart file														#
-# name_time=27184.1_rank=0.drs										#
-# Please comment in the below value, if restart is desired. 						#
+# Simulation restart                                                            #
+#                                                                    #
+# DuMux simulations can be restarted from *.drs files                            #
+# Set restart to the value of a specific file, e.g.:  'restart = 27184.1'                #
+# for the restart file                                                        #
+# name_time = 27184.1_rank = 0.drs                                        #
+# Please comment in the below value, if restart is desired.                         #
 #####################################################################
-# restart= ... 
+# restart = ... 
 
diff --git a/test/decoupled/2padaptive/test_impesadaptive.input b/test/decoupled/2padaptive/test_impesadaptive.input
index e4d79dffeea049721b6cbb3eface133476d1aa01..bf3aa97dfb76dbce6d5b4ba2e8e478ac16d9fa07 100644
--- a/test/decoupled/2padaptive/test_impesadaptive.input
+++ b/test/decoupled/2padaptive/test_impesadaptive.input
@@ -1,39 +1,39 @@
 #############################################################
-# Parameter file for test_impes							    #
-# Everything behind a '#' is a comment				        #
-# Groups can be ordered e.g. : [BoundaryConditions], 		#
-# see ../boxmodels/2p2c/ for a more detailed example		#
+# Parameter file for test_impes                                #
+# Everything behind a '#' is a comment                        #
+# Groups can be ordered e.g. : [BoundaryConditions],         #
+# see ../boxmodels/2p2c/ for a more detailed example        #
 #############################################################
 
 #############################################################
-# Mandatory arguments										#
+# Mandatory arguments                                        #
 #############################################################
-tEnd = 2e7	# [s]
-dtInitial = 0	# [s]
+tEnd = 2e7# [s]
+dtInitial = 0# [s]
 
 [Grid]
-numberOfCellsX = 2 # [-] level 0 resolution in x-direction
-numberOfCellsY = 1 # [-] level 0 resolution in y-direction
+numberOfCellsX = 2# [-] level 0 resolution in x-direction
+numberOfCellsY = 1# [-] level 0 resolution in y-direction
 
-upperRightX 		= 300 # [m] dimension of the grid
-upperRightY 		= 100 # [m] dimension of the grid
+upperRightX = 300# [m] dimension of the grid
+upperRightY = 100# [m] dimension of the grid
 
 #############################################################
 #parameters for grid adaption                               #
 #############################################################
 []
-MinLevel = 0	# [-] minimum level of refinement 
-MaxLevel = 5	# [-] maximum level of refinement
-RefineTolerance = 0.05	# threshold for refinement criterion
-CoarsenTolerance = 0.001	# threshold for coarsening criterion
+MinLevel = 0# [-] minimum level of refinement 
+MaxLevel = 5# [-] maximum level of refinement
+RefineTolerance = 0.05 # threshold for refinement criterion
+CoarsenTolerance = 0.001 # threshold for coarsening criterion
 
 #########################################################################
-# Simulation restart										            #
-#																	    #
-# DuMux simulations can be restarted from *.drs files				    #
+# Simulation restart                                                    #
+#                                                                        #
+# DuMux simulations can be restarted from *.drs files                    #
 # Set restart to the value of a specific file, e.g.: 'restart = 27184.1'#
-# for the restart file													#
-# name_time=27184.1_rank=0.drs										    #
-# Please comment in the below value, if restart is desired. 			#
+# for the restart file                                                    #
+# name_time = 27184.1_rank = 0.drs                                            #
+# Please comment in the below value, if restart is desired.             #
 #########################################################################
-# restart= ... 
+# restart = ... 
diff --git a/test/freeflow/stokes/test_stokes.input b/test/freeflow/stokes/test_stokes.input
index 3fceb0d1725cdfeb6e64e6aa4e83fb42b4581612..f9963bd9c150b7a2acd8a3b98d13c6e8dfd06ac1 100644
--- a/test/freeflow/stokes/test_stokes.input
+++ b/test/freeflow/stokes/test_stokes.input
@@ -1,24 +1,24 @@
 #############################################################
-# Parameter file for test_stokes						    #
-# Everything behind a '#' is a comment						#
-# Groups can be ordered e.g. : [BoundaryConditions], 	    #
-# see ../2p2c/ for a more detailed example				    #
+# Parameter file for test_stokes                            #
+# Everything behind a '#' is a comment                        #
+# Groups can be ordered e.g. : [BoundaryConditions],         #
+# see ../2p2c/ for a more detailed example                    #
 #############################################################
 
 #############################################################
-# Mandatory arguments										#
+# Mandatory arguments                                        #
 #############################################################
-dtInitial	=10	 	# seconds
-tEnd		=6e3	# seconds
-gridFile	=./grids/test_stokes.dgf
+dtInitial = 10 # seconds
+tEnd = 6e3 # seconds
+gridFile = ./grids/test_stokes.dgf
 
 ##########################################################################
-# Simulation restart												     #
-#																	     #
-# DuMux simulations can be restarted from *.drs files				     #
+# Simulation restart                                                     #
+#                                                                         #
+# DuMux simulations can be restarted from *.drs files                     #
 # Set restart to the value of a specific file, e.g.:  'restart = 27184.1'#
-# for the restart file												     #
-# name_time=27184.1_rank=0.drs										     #
-# Please comment in the below value, if restart is desired. 		     #
+# for the restart file                                                     #
+# name_time = 27184.1_rank = 0.drs                                             #
+# Please comment in the below value, if restart is desired.              #
 ##########################################################################
-# restart= ... 
+# restart = ... 
diff --git a/test/freeflow/stokes2c/test_stokes2c.input b/test/freeflow/stokes2c/test_stokes2c.input
index 776255d54586861edf1399f2d03204d76f7e114a..cacd97dc4c21bf49a00a36391bed43d654624e5b 100644
--- a/test/freeflow/stokes2c/test_stokes2c.input
+++ b/test/freeflow/stokes2c/test_stokes2c.input
@@ -1,24 +1,24 @@
 #############################################################
-# Parameter file for test_stokes2c  					    #
-# Everything behind a '#' is a comment						#
-# Groups can be ordered e.g. : [BoundaryConditions], 	    #
-# see ../2p2c/ for a more detailed example				    #
+# Parameter file for test_stokes2c                          #
+# Everything behind a '#' is a comment                        #
+# Groups can be ordered e.g. : [BoundaryConditions],         #
+# see ../2p2c/ for a more detailed example                    #
 #############################################################
 
 #############################################################
-# Mandatory arguments										#
+# Mandatory arguments                                        #
 #############################################################
-dtInitial	=0.1 	# seconds
-tEnd		=2 		# seconds
-gridFile	=./grids/test_stokes2c.dgf
+dtInitial = 0.1 # seconds
+tEnd = 2 # seconds
+gridFile = ./grids/test_stokes2c.dgf
 
 ##########################################################################
-# Simulation restart												     #
-#																	     #
-# DuMux simulations can be restarted from *.drs files				     #
+# Simulation restart                                                     #
+#                                                                         #
+# DuMux simulations can be restarted from *.drs files                     #
 # Set restart to the value of a specific file, e.g.:  'restart = 27184.1'#
-# for the restart file												     #
-# name_time=27184.1_rank=0.drs										     #
-# Please comment in the below value, if restart is desired. 		     #
+# for the restart file                                                     #
+# name_time = 27184.1_rank = 0.drs                                             #
+# Please comment in the below value, if restart is desired.              #
 ##########################################################################
-# restart= ... 
+# restart = ... 
diff --git a/test/freeflow/stokes2cni/test_stokes2cni.input b/test/freeflow/stokes2cni/test_stokes2cni.input
index d88cf40fb9e37759ee28bdb913cc6a7ea758d96c..971342e95d0c4a2406413d2bcb3b6eed76c3e027 100644
--- a/test/freeflow/stokes2cni/test_stokes2cni.input
+++ b/test/freeflow/stokes2cni/test_stokes2cni.input
@@ -1,24 +1,24 @@
 #############################################################
-# Parameter file for test_stokes2cni					    #
-# Everything behind a '#' is a comment						#
-# Groups can be ordered e.g. : [BoundaryConditions], 	    #
-# see ../2p2c/ for a more detailed example				    #
+# Parameter file for test_stokes2cni                        #
+# Everything behind a '#' is a comment                        #
+# Groups can be ordered e.g. : [BoundaryConditions],         #
+# see ../2p2c/ for a more detailed example                    #
 #############################################################
 
 #############################################################
-# Mandatory arguments										#
+# Mandatory arguments                                        #
 #############################################################
-dtInitial	=0.1 	# seconds
-tEnd		=3	 	# seconds
-gridFile	=./grids/test_stokes2cni.dgf
+dtInitial = 0.1 # seconds
+tEnd = 3 # seconds
+gridFile = ./grids/test_stokes2cni.dgf
 
 ##########################################################################
-# Simulation restart												     #
-#																	     #
-# DuMux simulations can be restarted from *.drs files				     #
+# Simulation restart                                                     #
+#                                                                         #
+# DuMux simulations can be restarted from *.drs files                     #
 # Set restart to the value of a specific file, e.g.:  'restart = 27184.1'#
-# for the restart file												     #
-# name_time=27184.1_rank=0.drs										     #
-# Please comment in the below value, if restart is desired. 		     #
+# for the restart file                                                     #
+# name_time = 27184.1_rank = 0.drs                                             #
+# Please comment in the below value, if restart is desired.              #
 ##########################################################################
-# restart= ... 
+# restart = ... 
diff --git a/tutorial/tutorial_coupled.input b/tutorial/tutorial_coupled.input
index 620ccdeac5c8f1275d203ff8826d11940f5cdd23..326a545fcbb202655474c3289255c89c83e1ce9e 100644
--- a/tutorial/tutorial_coupled.input
+++ b/tutorial/tutorial_coupled.input
@@ -1,7 +1,7 @@
-tEnd=500000 # duration of the simulation [s]
-dtInitial=10 # initial time step size [s]
+tEnd = 500000 # duration of the simulation [s]
+dtInitial = 10 # initial time step size [s]
 [Grid]
-upperRightX=300 # x-coordinate of the upper-right corner of the grid [m]
-upperRightY=60 # y-coordinate of the upper-right corner of the grid [m]
-numberOfCellsX=100 # x-resolution of the grid
-numberOfCellsY=1 # y-resolution of the grid
+upperRightX = 300 # x-coordinate of the upper-right corner of the grid [m]
+upperRightY = 60 # y-coordinate of the upper-right corner of the grid [m]
+numberOfCellsX = 100 # x-resolution of the grid
+numberOfCellsY = 1 # y-resolution of the grid
diff --git a/tutorial/tutorial_decoupled.input b/tutorial/tutorial_decoupled.input
index 17be2ef24b2d80c1fa928e445cda3b8ce95df8c8..65972f1a1cd5b712b8b9cb28d96501d2d54e9d5a 100644
--- a/tutorial/tutorial_decoupled.input
+++ b/tutorial/tutorial_decoupled.input
@@ -1,7 +1,7 @@
-tEnd=100000 # duration of the simulation [s]
-dtInitial=10 # initial time step size [s]
+tEnd = 100000 # duration of the simulation [s]
+dtInitial = 10 # initial time step size [s]
 [Grid]
-upperRightX=300 # x-coordinate of the upper-right corner of the grid [m]
-upperRightY=60 # y-coordinate of the upper-right corner of the grid [m]
-numberOfCellsX=100 # x-resolution of the grid
-numberOfCellsY=1 # y-resolution of the grid
\ No newline at end of file
+upperRightX = 300 # x-coordinate of the upper-right corner of the grid [m]
+upperRightY = 60 # y-coordinate of the upper-right corner of the grid [m]
+numberOfCellsX = 100 # x-resolution of the grid
+numberOfCellsY = 1 # y-resolution of the grid
\ No newline at end of file