[#1025] Fix failing tests due to extra redirect etc (stupid tests)