added some more test and clean up

Signed-off-by: Patrick Meier <patrick.meier111@googlemail.com>
Could you please fix the spacing here? (double space between pending and file makes travis complain ;))