some progress on grunt refactor & deploy tests