Updates to tesing files
Merge branch 'Test_updates_bug_fixes' into dev