made changes to facilitate tests, laying pipe for fixture impl