Fix dailies

Adds tests to #21