Moved sample programs, more testing