Updates to fix Test build