Updating w1 stubs + tests to reflect new assignment