Cleanup and additional Physics testing stuff.