splashscreen matching fix and more tests