FIX: Better surface test