fixed some WS issues and added tests for for loops