latest subs with nested validations merging fix
indenting
adjusting test to new subs version