Cleaned up errors in tests