Fix labels and add better tests.

Signed-off-by: Yoan Blanc <yoan.blanc@cern.ch>
Merge pull request #20 from greut/fix-labels

Fix labels and add better tests.