5 more tests converted.

They are all pretty straight forward.

Tim