fixed some tests maybe?