Added more BrickModel tests.
Code cleanup.