Re-added the missing tests.