Fixed up the search bar, caught a few merge errors
added tests
temp commit
cart testing added