Added more tests. Updated fixture data for tests.