added last few tests, improved comments