Merge "Frameworks: Mark tests"