refactor test class structure

Signed-off-by: Markus Lamm <markus Lamm@googlemail.com>