some require() fixes, got some tests running