Add missing tests from last commit