Fixed test case failues found as part of AAI-3100 testing but not due to AAI-3100 fix