fix last 2 tests