Minor refactoring
new junit