Merge "Remove unused tests"