Testing teardown improvements

Also attempt to improve keyboard typing