removed meaningless test assertion
fixed bugs detected from autom tests