Adding unittesting