re-added test that I accidentally removed
cleaned up mess I caused when merging my stuff with an update from origin/master