Modifications to make tests run ok