close #243 Test codes are written for this issue however test codes are
passed. There is not a bug like #243. In addition, some refactors are
applied. Btw, let's use System.currentTimeMillis when needed because
http://stackoverflow.com/questions/368094/system-currenttimemillis-vs-new-date-vs-calendar-getinstance-gettime
@maydin

Signed-off-by: mekya <ahmetmermerkaya@gmail.com>