Tests - Reorganize test structure. Added datacontext specs. Refactor a few things