added some more generic tests