Added a test of different bulid separators.
Made regex tolerate more build separators.