Basic geometry switch
Fixed tests