ticket:3 Added more test restrictions