Improved variable and parameter tests