#26 Add more unit tests
#9 Fix toString() and add some unit tests