ahh.. in fact we will probably need more tests that uses custom caldav servers in the future (specially to test event attendees) so it's OK if we keep this logic here.. - no need to change it.