fixing failing tests and skipping performance tests