Port a couple more ejdb tests