Cleaned up specs and converted to new expectation syntax.