Various updates to test