Add final testing bits