missed a couple things

still a couple tests that need to be fixed / adjusted