Upgraded to work with trunk now. Also moving all the TEST files now