Fixes so app will start; fixing tests