Added: two kind of tests