Hardening unit tests