Updated to make automated tests run under CI