W7-A6 TODO's completed and tests succeeded