Print some extra messages in test file. and tidy up files outside.