Fixing failing tests for now