More fix ups and update SwapView test with better support.