FIX: Changing tests based on sample update