Better test implementation