remove old stuff
add simple tests