Added setclass-tests back