diff --git a/core/abstract_tests/core/ATS_http.adoc b/core/abstract_tests/core/ATS_http.adoc
index 1a8a2c94..27e32239 100644
--- a/core/abstract_tests/core/ATS_http.adoc
+++ b/core/abstract_tests/core/ATS_http.adoc
@@ -1,4 +1,5 @@
 [[ats_core_http]]
+
 [abstract_test]
 ====
 [%metadata]
diff --git a/core/abstract_tests/job-list/ATS_limit-def.adoc b/core/abstract_tests/job-list/ATS_limit-def.adoc
index 440f9821..a23c2d86 100644
--- a/core/abstract_tests/job-list/ATS_limit-def.adoc
+++ b/core/abstract_tests/job-list/ATS_limit-def.adoc
@@ -1,17 +1,16 @@
-[[ats_job-list_limit-definition]][abstract_test]
+[[ats_job-list_limit-definition]]
+
+[abstract_test]
 ====
 [%metadata]
-label:: /conf/job-list/limit-definition
-subject:: <<req_job-list_limit-definition,/req/job-list/limit-definition>>
+identifier:: /conf/job-list/limit-definition
+target:: <<req_job-list_limit-definition,/req/job-list/limit-definition>>
 test-purpose:: Validate that the `limit` query parameter is constructed correctly.
-
-[.component,class=test method]
-=====
-[.component,class=step]
+test-method::
++
 --
 Verify that the `limit` query parameter complies with its definition in requirement <<req_job-list_limit-definition,/req/job-list/limit-definition>>.
-
-Note that the API can define different values for "minimum", "maximum" and "default".
 --
-=====
 ====
+
+NOTE: The API can define different values for "minimum", "maximum" and "default".
diff --git a/core/abstract_tests/job-list/ATS_limit-response.adoc b/core/abstract_tests/job-list/ATS_limit-response.adoc
index 37258580..7f37bfeb 100644
--- a/core/abstract_tests/job-list/ATS_limit-response.adoc
+++ b/core/abstract_tests/job-list/ATS_limit-response.adoc
@@ -1,31 +1,20 @@
-[[ats_job-list_limit-response]][abstract_test]
+[[ats_job-list_limit-response]]
+
+[abstract_test]
 ====
 [%metadata]
-label:: /conf/job-list/limit-response
-subject:: <<req_job-list_limit-response,/req/job-list/limit-response>>
+identifier:: /conf/job-list/limit-response
+target:: <<req_job-list_limit-response,/req/job-list/limit-response>>
 test-purpose:: Validate that the `limit` query parameter is processed correctly.
-
-[.component,class=test method]
-=====
-
-[.component,class=step]
---
-Get a list of jobs as per test <<ats_job-list_job-list-op,/conf/job-list/job-list-op>> and append the `limit` query parameter to the request.
+test-method::
++
 --
+1. Get a list of jobs as per test <<ats_job-list_job-list-op,/conf/job-list/job-list-op>> and append the `limit` query parameter to the request.
 
-[.component,class=step]
---
-Count the number of jobs listed in the response.
---
+2. Count the number of jobs listed in the response.
 
-[.component,class=step]
---
-Verify that this count is not greater than the value specified by the `limit` parameter.
---
+3. Verify that this count is not greater than the value specified by the `limit` parameter.
 
-[.component,class=step]
---
-If the API definition specifies a maximum value for `limit` parameter, verify that the count does not exceed this maximum value.
+4. If the API definition specifies a maximum value for `limit` parameter, verify that the count does not exceed this maximum value.
 --
-=====
 ====
diff --git a/core/abstract_tests/job-list/ATS_links.adoc b/core/abstract_tests/job-list/ATS_links.adoc
index 10ae6078..18f5afde 100644
--- a/core/abstract_tests/job-list/ATS_links.adoc
+++ b/core/abstract_tests/job-list/ATS_links.adoc
@@ -1,25 +1,18 @@
-[[ats_job-list_links]][abstract_test]
+[[ats_job-list_links]]
+
+[abstract_test]
 ====
 [%metadata]
-label:: /conf/job-list/links
-subject:: <<req_job-list_links,/req/job-list/links>>
+identifier:: /conf/job-list/links
+target:: <<req_job-list_links,/req/job-list/links>>
 test-purpose:: Validate that the proper links are included in a response.
-
-[.component,class=test method]
-=====
-[.component,class=step]
---
-Get a list of jobs as per test <<ats_job-list_job-list-op,/conf/job-list/job-list-op>>.
+test-method::
++
 --
+1. Get a list of jobs as per test <<ats_job-list_job-list-op,/conf/job-list/job-list-op>>.
 
-[.component,class=step]
---
-Verify that the `links` section of the response contains a link with `rel=self`.
---
+2. Verify that the `links` section of the response contains a link with `rel=self`.
 
-[.component,class=step]
---
-Verify that the `links` section of the response contains a link with `rel=alternate` for each response representation the service claims to support in its <<sc_conformance,conformance document>>.
+3. Verify that the `links` section of the response contains a link with `rel=alternate` for each response representation the service claims to support in its <<sc_conformance,conformance document>>.
 --
-=====
 ====
diff --git a/core/abstract_tests/job-list/ATS_processid-mandatory.adoc b/core/abstract_tests/job-list/ATS_processid-mandatory.adoc
index b039f5fc..6c3b393d 100644
--- a/core/abstract_tests/job-list/ATS_processid-mandatory.adoc
+++ b/core/abstract_tests/job-list/ATS_processid-mandatory.adoc
@@ -12,4 +12,5 @@ test-method::
 1. Get a list of jobs as per test <<ats_job-list_job-list-op,/conf/job-list/job-list-op>>.
 
 2. Verify that each job includes a `processID` property.
+--
 ====
diff --git a/core/abstract_tests/job-list/ATS_processid-response.adoc b/core/abstract_tests/job-list/ATS_processid-response.adoc
index d233ee44..9d5002eb 100644
--- a/core/abstract_tests/job-list/ATS_processid-response.adoc
+++ b/core/abstract_tests/job-list/ATS_processid-response.adoc
@@ -14,4 +14,5 @@ test-method::
 2. Inspect the value of the `processID` property for each job listed in the response.
 
 3. Verify that that value of the `processID` property matches one of the values specified for the `processID` query parameter.
+--
 ====