Added more unit tests and removed a console log