Amended constructor, added Jasmine