Add boolean test. Unfortunately there is a bug in the diskbased code somewhere