Make tests a bit more comprehensive