Cleaning project.
Fixing and improving DetectorTest.
Improving DetectorTest some more.