Commented out a couple of tests who would be acted upon later