A minor reorganisation of test.cpp
Remove Eval and use overloaded typcasts instead