reverted to normal int functions with no return enforcements
fixed test case whileFor
merged with previous conflicts