Updated Tests
Cleaned up deploy