Assertion/send_keys cleanup in #425 - more cleanup