Finished declarative refectoring and rewriting jasmine unit tests