Merged test-unit.conf into karma.conf and updated grunt file to point to karma.conf for unit-tests; removed some redundant unit tests;