algorithm changed; major numpy failure fixed
Merge method updated.
initial test structure
model tests
tests for views