More tests, fixed check-file-name