Removed CoreService and TestProducer from test scripts