Added fixture
New tests