Card #187 - fix for tests