Lots of toString() fixes/impl and JUnits