Add some fixes in test
tiny fixes