Improved Test Code