GH #152 - Fixed failing tests.