Refactoring test items back