some more tests. plus more organized. plus junit!