fixed order of loading of parameters
separated the tests into different files