doc and test cleanup