Updated demolish tests to show 'given' then integrated tests into src per Ed Maphis' request