fixes. tests