Changed test suite to follow the o w e arguments of the target suite.

This renders also checks useless.