Updated JUnit Tests

Includes instrumentation and lays out files in a different hierarchy