Added more user maintenance unit testing