updates for split off of junit