Improved Tests