added fixtures for tests and modified tests