added some more tests and some more shinny functionality