more tests and methods fixes