Forgot to add this file for tests
Fix compiler errors