More documentation
Test fixes