creating more tests and some db and model modification