Add datadir back, as its used within a lot of tests

Signed-off-by: Ken Barber <ken@bob.sh>