Switched to Detector classes
Added more UnitTests