Jay: Improved test cases and corresponding changes.