Fix bug in loading brushes more than once
Update test classes