fixed some issues raised by precious on test session