Update and rename shapes.go to gotest.go