Remove dependency on junit