fixed build and test