Unnecessary imports removed in test classes.
Missing annotation added.