Move u2u files out of test project, update test project with hacks for testing