V2 ready for deployment

Additional tests added and passing
Bugs fixed