Remove shuffle test
Complete migration of thing logic to thing subsystem