Fix both #227 tests