Improve wiki subclassing

Closes #36
I don't see the issue in getting the commit this way for this specific test, so I'm not sure if the FIXME comment is even necessary.