Merge "Removing older Jank tests."