UnitTests

Fix errors