Updated to Jasmine 2