Add more unit tests
Update unit tests
Remove println