Updated tests
Updated karma.conf.js