moved these files up one level.
improve the test framework