Fix typos in test names
Don't include name in package source filename if name is None