2 tests fixxed