Got rid of junit stuff