Applying fix for tests breaking in <5.4, adding 5.5 to build matrix