fixed test paths and some other small issues