Start adding Unitests