Added a fast unit test runnnig, and removed unused code.