make ready to run tests
fix bugs