Removed old code and fixed the initial test class
Removed dead  code from basic, and odd links from Collector class to the old code