Updated tests for strict compilers or VC++