Test fixes

This gets the test webapp working again.