Restructure and expand tests
Merge pull request #9 from RobrechtDR/master

Restructure and expand tests