Add missing tests back