Strengthening unit tests