minor changes for unit test bugs