Adds conveniences for testing.