Fixed testing stuff

Some paths are still left to be fixed. But all the tests seem to work.