Add some generic tests