uses more efficient method for searching, refactors some code
corrects small error in fixtures file