added UnitTests