test bugs fixed