test fix & toString() changes