Added calendar function to simple health test
Moved code to reduce database access occurrences