revamping testing and getting ready for phantomjs testing