Strengthen unit test