Test updates

Changed unit test to point to dev by default and added option to get server from environment in Java