Move test to test scope
Remove dependency on junit