Readded test

A single revision of the default test to make it work with calendar.