fixes. new tests