* updated test case, code cleanup, documentation fixes