Remove old test project
Merge branch 'modules' into public-modules