Adding temporary (poor) support for tested parameters