#JC-1506 Refactored tests to be more readable.