Pass all tests, closes #145