Fix minor issues with tests