Fix fixtures and functions after island refactor (#264)