test & checkstyle fix for mapCleared pr