build/test error fixes #3