Fixed Test classes too