Still more test added
Some refactor

Signed-off-by: Pascal Piche <pascal@deuxhuithuit.com>