Enhancement tests

And everybody say

(to be added to the respective post tomorrow)