Fixed a performance issue / added request test