Updated entity-test to develop control system