Refactored some specs and fixed the Promise after resolve ones.