switching appropriate macros to use comma delimited statement over &&
moving solid components into the bricks area
converting brick tests