Better test behavior