Test fixes

Fixes for the new page