added test separation and fixed a few locale issues