flesh out tests a bit (find first issue ;-)