Cleaned up tests structure

@tmuthamizhan 

Cleaned up tests

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>