Long forgotten changes made to base and functional testing class, as well as adding tests to imporove development process
Cleaning up directory structure