fixed some errors, more successfull tests