update based on aerogear.js update
make all tests pass