Fixes for tests broken by Jline2