Merged variable utility class into template class and removed it. Added test case for ensuring that variables are split properly