Issue #2: get tests passing?