Fix unittests

yeap, already removed those and added !active guard to if block before this. Is the target branch correct?