adapt rebased changes to jasmine 2