Improved /tests