Updated logging
Finished intial run of basic test suite