Removed deprecated data/methods. Added test case.