Added missing tests