Change builds for tests
Moved to util test suite