Removed prints, improved unit test fail message and removed unused
tests.