Made first test and updated other classes