Re-factored Tests