refactored tests so that the tests are generated :)