Clean up specs so everything passes