Updated test suite and cleaned up Types module.

Signed-off-by: slannez <sebastien.lannez@gmail.com>