Move unittest2 and mock into hard deps