tests adapted to basename output
Fix typos in tests
New basename instead of output implemented