Add unit test build back into the fold