started to add some tests
got most tests to work