fixed some tests, added some others