endeavor to get tests passing ...