Updated Behavior Tests