Re-factored to make writing the next tests easier