Fixed unused use statements
Changed "or" logical operator usage to "||"
Fixed non-executing tests