Go added code and test