Updated test and sinclude