Added Unit Tests and updated grunt