Changed tests a bit.