These tests now pass