goodbye testcpp

simplify might be a little buggy - changed store back to a stack and
added a swap function to switch the variables at the top of the store
and vars stack.