Merge test

initial test merge to upstream. note content is still work in progress.