Added some constants.
Restore cleans out missing files and some basic unit tests.