Re-factored test so errors are more descriptive.