Stronger unit tests