fixed some test issue