JASCIS-54: (Unit tests for TRAC:416, TRAC-417)