Cleanup
Added long-running acceptance test.
Rename test working again.
Lot's of stuff.