improvements and start of the test file