Change syntax to have less tests