added some more test and clean up

Signed-off-by: Patrick Meier <patrick.meier111@googlemail.com>