test tidy up
improved control-plane test
added get container by id to control-plane