Remove print to console
Add tests