Added ability to match block arguments.
Remove spy