Refactored van spec to use doubles