Remove use of junit-addons