Continued to breakup/add test files, and removed some scons files