major refactoring.
fixed tests after major refactoring
bumped version of junit-dep from 4.8.2 to 4.10