Started refactored test parameters + improved check test

See also comments in your Pull Request to sap-production.