Fixed test data and working on Detector implementation