* Adjust homekit controller pairing errors back to a single step * adjust test * Revert "Adjust homekit controller pairing errors back to a single step" This reverts commit e5ed89bbbb053bb814219052ae99697a5a7b4e46. * Revert "adjust test" This reverts commit c2e9f21a8401c144315260f6fdf71ea8060f8ca3. * adjust * prune * prune * merge * Update tests * remove debug * adjust * Multiple steps * adjust the test