More tests passing, nested .then, refactor, nested reject still fails