Cleaned up specs to use `expect` syntax