Change zoom shortcut to + and -, optimize tests