Engine: Fixes #3586 - Updates spec model tests and splits the

spec and test runs out again to prevent issues with the disable_glue_layers
functionality in the test/ tests.