Small fix for Marks test improvement + refactoring