Merge "Fixing unit tests and moving to proper location." into jb-mr2-dev