Expand tests a bit