Simplified file component constructor names.

Simplified test cases with promise.async.