Cleaned up tests, got them running and refactored smartsheet interactions