Updated generic tests