Tests refactoring
Merge branch 'master' of ssh://github.com/kshin/CategoryKit