Update tests

This branch updates a few tests. All but one should behave identically.