Restructured tests. Adding 'find distillery'.