Fixing test classpaths