Made Model more mockable
Made Model inherits from Observable by default