More tests coverage