update tests for Test
fix failing tests