doc_test_now working, also fixed a few actual test problems