Added / fixed some tests