refactored Brick Tests