Further preparations for prog. calc
Fixed Non Calculating Bug
Started work on Programming Test Cases