Removed engine tests and moving to explicit tests