Implemented issue #24 and removed references to junit.framework.*