Revert "Refactoring test case service"

This reverts commit 4b117485a90013ab301b7ec8d8aec804c01050a3.