Refactored tests; added failing test for van