Add junit annotations and move test classes to maven test folder