Deleted test programs, code moved to real programs