Added BaseDimensionTest. Premerge commit
Merge of changes to tests
Added tests, fixed bug