Marc: Tests updated