Attempting to fix unit testing on cisimple.