Added some testing code.
Merging test branch