Fix for Issue #24

including test and fixtures update