[refactor] extracted reused code
[refactor] fixes + extracted reused code
[grunt] let testacular watch files
[test] covered move
[build] fixes + refactor