passing unit tests and backtracking on RPC for now