Refactored ui brick test classes