Added more tests for toString(), and added to main()