BZ-10466: changes to mock/dash
BZ-10090: revising text classes