Fixed shit added tests