Changed the way of choosing tests