Cleaned up HA tests with better given-asserts