Added more tests and started logging instead of printing