more test related changes and a directory move