added some tests. made some more methods testable