Added a couple of new files that can replace the current testing framework. Testing results are clearer and adding tests is simple. Will work more on it.