added fixtures and more tests and test data