fixes with tests