Tests are now passing