All tests updated and refactored to work with update away project structure
Added missing references
commented out test code