Completed moving to old assertion style
Completed another test conversion