Fixed tests on command line failing (but passes in Xcode)