Fixed tests for new addPrimaryFields() logic
Updated tests for new naming convention for insertUpdate form template
WIP: Development snapshot