Search renamed SearchString, restructured and RSpec tests added