Fix up tests from feedback