Restore previous test syntax

This reads a bit better