Got unit tests passing after cespy work-over