Make test better