moving test configuration files around and some small changes