More fixes to tests. Made fixtures for some classes