changed phpunit tests again as well restructured folders in hopes of working with travis builds