Add new logic for bonus and counting of the hole score, but tests depend on each other