attempting to fix karma/jasmine broken tests
fixed tests
new model?
playing around with