More tests

for better or worse? I don't know...