finishing touches, fix test task