add testing with jasmine
reorganizing tests
reorganizing tests
Merge remote-tracking branch 'origin/master'