Building tests for Documents
Refactor documents