Added new tests on ther classes