Improved tests granularity