#829 - refactoring test for clarity.