Modified to work with Jasmine 2.0 - not tested yet