add missing junit tests
add junit tests back to folders