add accidentally removed files back in and fixed output and make tests behave better generally