add test
fix for dowhile
fix for
fix test
fix function