methods and tests
test fixes, more tests