Address alex's comments - remove comments and test text