Make tests more CommonJS like