Figured I would clean up the remaining tesla mock warnings. Borrowed some solutions from !1659 (diffs)
@alex.s
This will create a new commit in order to revert the existing changes.
