*fixed some test bugs