Refactored test classes of Bricks