This commit cleans up a few test warnings