TASK KSP-513: Added tests