#6 resolve test bug's