Added motrr additions. Single test can be switched on or off.