Huge overhaul
Refactor the test and don\'t include goals defined as daily that have already been done