Purge CamelCase, fix date-dependency in unit test