Removed fixtures and added a test