Added test script.
Removed deprecated code.