remove reliance on rewritten urls, couple more tests