list fix and unit tests