fixed some issues raised by precious on test session
issues clean up #precius test