moved test file. Minor tweaks