Add more unit-tests and extend already existing ones