Splash test and more (updated)