Jay:	Test cases updated and methods re-named.