Started refactored test parameters + improved check test