[style] rearringing code
[test] added failing spec for #1