Migrate legacy test 4

This is just the start. More pull requests are coming!