Removing extraneous logging
Moving tests to separate folder
1.0