Fix or backlog broken tests
Fix broken specs