Draft Issue #16

Adjustments in tests