Fix tests for single files