Merge "Stop using junit classes in production"