Quantum mechanical measurement of non-orthogonal states and a test of non-locality