port to jasmine 1.3, removed optional/bonusses