Refactor of the assertions methods
Coding resumed

Signed-off-by: Henrique Alves <halves@gmail.com>