End green suite

Fix broken test suite. All tests are now passing.