Little bit of cleanup
Fixing tests on 1.4, I hope