Sorting out unit tests