Merged everything but the test documentation