All feedback and test issues corrected