Promisifying more and fixing a test
Always returns model on save