modify to comply module 1.0 test cases