#641 - All tests passing