Update test suite / deps to build in clean-room environment