Adding some missing tests