Split out tests and check for explicit values
Removed old test