Improved create test