Add some helpful tests