Made test compile with new package structure