Adding missing tests