Proper way of fixing tests