fix up tests, add waiter, update the way build works