Changed message for illegal instances
Clean up testsuite and remove duplicate use of files