Fixed failing tests (gh #101)