change proper variable name and clean the4 space in unit test