Continue cleaning up, finishing touches on TEST_MANUAL