Improved Test()