Updated tests for decl formats