Retroactively added test for #2
Made test and content property handling more robust, closed #3