Add entities for test system functionality.
Merge remote-tracking branch 'origin/master'