Task URBNG-281 completed with tests.