Optimize ErrorsTest into one all encompassing test