Updated UnitTests