Formatted model states in autodetector tests
Cleaned up and reformatted autodetector tests