skip + refactorings
junit 4.11
tests + optimization for strategy