fixes. tests
tests
before merge
after merge