Finish import options tests; fix discovered bugs.