Addded more missing tests.