Trying to have more testing stubbed