Shuffled some stuff and dropped test vp5 that made no sense since it's not supported. Travis likey?