Modified fixtures and added more tests