#1 working on fixing unit tests, updating karma to current version
reverted changes that should go to branch