Looks p good, I think last thing is I'd add an integration test that verifies the built-ins haven't been overridden. Our integration tests are pretty wacky, so I don't mind putting that part together.