replaced deprecated junit.framework.Assert with correct org.junit.Assert class
tests and pom refactoring
Merge branch 'local' into develop