Merge "Fix testGetCurrentItem by fixing setUp and tearDown methods." into jb-dev