Refined unit tests