refactoring
Fixed to run rspec command correctly.

Signed-off-by: Tsuyoshi Ozawa <ozawa.tsuyoshi@gmail.com>
Fixed to pass test cases correctly.

Signed-off-by: Tsuyoshi Ozawa <ozawa.tsuyoshi@gmail.com>
rebased on current trunk

Signed-off-by: Tsuyoshi Ozawa <ozawa.tsuyoshi@gmail.com>