Removed some code that created test errors that I had added earlier