Test: make test less evil so it doesn't take so long