implement simple tests as submodule
clean-up code