Changed how the Test Infrastructure is Structured to report clearer fail messages

Also rearranged some of the test files removing duplicates and moving
non fixed files into a separate fail folder