Issue #231 attempted tests fix