Save last input / default input implementation
Fixing tests