Am I crazy or did we want to add "tests" here? CC @ewinslow