Improved the readability of ArgumentAssertions. Work in progress!

Signed-off-by: Jesús López Alonso <jeslopalo@sandbox.es>