Fixed the "test bugs"