[WIP][FOLD] Cleanups
Convert a unit test to manual