Update Tests

Collate related tests together.