Finish quick junit testing change.  Need to fix how build.xml calls, junit, but it works for now