Fixed next unit tests