Test: make test less evil