Updated annotations and tests for friday state