Finish refractor-ed components with time.

with uni-tests
Finish refractor-ed components with variable.

with uni-tests and dirty code.