added passing on parameters and fixed testfiles