Closes #26 and #27. Search controller was refectored and tests were included for search controller and service