updated 2 Jasmine tests
ping to Viv/Marcello: refactored tests, add more pending tests