Unit listing should be clearer