More hacks
Tests to prove that the hacks are working
More hacks & tests, but still failing..