Fixed solid tests
Fixed merge mistakes in solids
A few more fixes
Merge branch 'master' of https://github.com/ikeough/Dynamo