reordered unit tests