Jphm
Cleainup
Karma tests
Missed commit