Merge "Amend some unit tests for robustness"