Teeny fixes

Artillery timing change, whale test package ordering