Moved tests into jUnit test area ... ?