removed duplicate test (also in cl_spec.lua), fixes to setup/teardown