Refactor push specs