Merge pull request #160 from coheigea/junit

Remove old junit.framework imports