Test session 1 passed. Couple of fixes.