Updated location code
Reworked test compiler support