Modified tests to correspond to Go version