Issue #270 fixing tests