Adding more missing tests