Updated tests and bugfixes for humbled branch

These commits get all tests passing on the humbled branch.