van tests all part refactored for doubling