Added test methods and relocated all the logging in the set up method