Adding test, refactor the last commit ex:0.1