Finished up bestallhands tests, fixed some bugs related to them