Changed tests back to be more similar to existing ones.