Cleaned up and reformatted autodetector tests