updating tests to work better, still some failures