Added test support brushes
Updated shape recognition