Tests now pass