Work toward improving solidity. Add a few more unit tests, and some toString()