Restored missing tests