Added comments
Moved from parse_test