tests! (and fixes)