Updated tests to commonjs, still empty but closer to ready for future architecture