Jay: New wrapper classes added and stronger assertions made for test cases.