GH #175 - Fixed failing tests.