Cleanup script updates and 'check' unit test example