junit changes, class changes, lots of changes