Cleanup fixtures and move tests to lab