Missed some stuff from the last commit. Dumb. Also added expect test.