build/test error fixes#2