#97 Corrected usage of find-by annotation and added live test