fixed tests and updated grunt tasks.