Moved test programs to test directory. Updated cindata to latest versions from stuarts codebase.