added some generic tests