BHV-8196: Initial Test Updates