first jasmine testsgit merge feature/jasmine