Moved away from deprecated methods.

Moved to junit4 TestCases, removed unused methods.