Add generic tests