Continue refactor before/after hooks and argument restrictions

Continued refactoring tests to use before and after hooks.
Continued adding tests restricting number of allowed arguments.

Author: mybrainishuge