tidy imports
update build
fix broken test