Removed remaining references to junit.
Implemented additional tests.