Cleanup
Fix unit test for Watch3D