Start to build up unit-tests