remaking build & test