GTNPC-101 Added tests