Can't seem to figure out why tests continue to fail... cleaned up some stuff though