JUnit tests reorganized

tests moved to separate folder