#51 - All unit tests passing again.