Added testing switch added tax and shipping field