Couple comments and adding to test