improved the testing framework
improved the testing framework, cleaned up old files
improved the testing framework