flatten test dir
sort
simplify io test
more progress on code review
More review feedback - not yet submitted