clean up tests (to use junit), write simple tests, stuff...