Changed tests and tools to use 'discard' statements instead of 'nil' for empty blocks.
Merge pull request #928 from Varriount/testement/nil-to-discard

Changed tests and tools to use 'discard' statements