junit tests now broken... pushing so i can work remotely tomorrow