399.11 Cleanup and more testing