Fixed some of the tests but still need to get chosen to work