cleanup of top level testbench - half done

Signed-off-by: Marek Czerski <ma.czerski@gmail.com>