Add redirect specs and remove obsolete test code