Improved Test, fixing