Fixed test examples and dealing with phi keys