Removed engine-specific testing and extraneous engine dependencies.