Test changes

While developing (and testing) `keep_input` feature I thought tests could be a little more automated. This is a little proposition about it. What do you think?