Some adjustment to test