cleanup: fix all findbugs on test and calendar