Fix getting the first result and add specs