Enabled testing.
Improved handling of building.