Tried to stay backwards compatible, I will remove the block and change the tests.