reorganize expected files
fix markup for 1.16.0 (thanks @bijoyanupam !)