Merge "Adding additional assertions for retype test"