Added more require-resolve cases and tests