small clean ups and schema tests