Update tests so they compile at the very least