Minor cosmetic enhancements
Removed context (made into class variable)
Added version variable to test client