Re-factoring unit tests