Update to test fixtures and general code structure