Fixing broken reference to src folder, some cleaning up in the tests