#207 Change tests and code over to use separate create and get methods