Refined test implementation