Documentation fix, cleanup tests