Made tests more robust. Actually runs from top directory now.