update build, make tests pass