[Delivers #84024236] Cleaned up test implementation.