fixed build & tests