unit tests are fixed