Revert "Revert "Merge pull request #28 from grosser/grosser/test-load""

This reverts commit bc8041559a11c16ef25228b019250b3cc122e115.