Added some work on getting testing related stuff