fixed build/test targets