Improved: testing design