Tests now pass except render