Jay:Test cases and other minor changes.