Revert "Merge branch 'dk-follow-refactor-proper' of gitlab.syncad.com:hive/tests_api into dk-follow-refactor-proper" This reverts commit c084e20a, reversing changes made to 7bd064bf.