Test program updated
Some updates