Add tests for filename parsing. Use new methods.