Now able to build all test (there's still failures with tests having non-NULL return values