DAR-1405 Updated unit tests for readability