Cleaning up coding standards warnings
	- Adjusting docblock formatting
	- Dropping unnecessary mock classes