Cleanup of specs to make everything pass