Multiple testcases with single benchmark add on

Hi @mortenvp These are the changes. Let me know your opinion...