Included docs, refactored a test