Clean up code and don't use Gulp callback with Karma for now