- better error when name is expected
- reformatted some tests