More tests
More build fixes