Added more tests (including the ones developed during the training)