changed static to self
removed unused namespace imports
added test for findAllOrdered