Updated tests to reflect new schema
Updated tests
Stability improvements