Add test for multiple results
Code cleanup