Improve list of unit tests