few small changes/tests not working