Working tests (updates #286)