Added more tests to fully cover search and song handling